Merge "Add SetTapMaximumAllowedTime" into devel/master