implicitly unwrapped optional type is no longer used in these overridden methods
Merge branch 'develop'