Merge feature branch 'feature-cert'

Change-Id: If708ba37e79d6c9c8e13941ce89be97a7f45b3cb
Refs: #2861, #2868, #3058